From a3546dd2fc2c3bf39a340a0aa503be512eebffa7 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Mon, 26 Feb 2007 14:09:08 +0000 Subject: [PATCH] linux: Fix backward compatibility in page table handling A 3.0.2 compatibility requirement slipped my attention before submitting the original page table handling changes. Signed-off-by: Jan Beulich --- linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h index 7edb3e7ccf..31ce73e266 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h @@ -139,7 +139,11 @@ typedef struct { unsigned long pgprot; } pgprot_t; static inline unsigned long pgd_val(pgd_t x) { unsigned long ret = x.pgd; +#ifdef CONFIG_XEN_COMPAT_030002 + if (ret) ret = machine_to_phys(ret) | _PAGE_PRESENT; +#else if (ret & _PAGE_PRESENT) ret = machine_to_phys(ret); +#endif return ret; } #define HPAGE_SHIFT 22 -- 2.30.2